//
//  ViewController.m
//  baisi
//
//  Created by lanou3g on 15/12/24.
//  Copyright © 2015年 杨琦. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
    
    NSLog(@"123");
<<<<<<< HEAD
    
    NSLog(@"abc");
=======
    NSLog(@"dasd ");
    
>>>>>>> 6f2a1d433fb28f487fc3fa068576e6efb5cc3532
    
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

@end
